bitkeeper revision 1.1389.5.36 (427f7513GY6Vv1b-toMAsdXzaHGvTQ)

Hand merge

diff --cc xen/arch/x86/domain.c
Simple merge

diff --cc xen/arch/x86/domain_build.c
Simple merge

diff --cc xen/arch/x86/mm.c
Simple merge

diff --cc xen/arch/x86/shadow.c
index 6d8a8490050e33480db0219e79797836c19887c1,817757c36ae0fcf63ef6cb48b235ffe8918950fe..5e06fd14645516a3b3709cb9ee61c8cadf49e8d6
--- 1/xen/arch/x86/shadow.c
--- 2/xen/arch/x86/shadow.c
+++ b/xen/arch/x86/shadow.c
@@@ -1120,8 -1176,8 +1176,8 @@@ void __shadow_mode_disable(struct domai
       * Currently this does not fix up page ref counts, so it is valid to call
       * only when a domain is being destroyed.
       */
-     BUG_ON(!test_bit(DF_DYING, &d->flags));
-     d->arch.shadow_tainted_refcnts = 1;
 -    BUG_ON(!test_bit(DF_DYING, &d->d_flags) && shadow_mode_refcounts(d));
++    BUG_ON(!test_bit(DF_DYING, &d->flags) && shadow_mode_refcounts(d));
+     d->arch.shadow_tainted_refcnts = shadow_mode_refcounts(d);
  
      free_shadow_pages(d);
      free_writable_pte_predictions(d);

diff --cc xen/arch/x86/traps.c
Simple merge

diff --cc xen/arch/x86/vmx.c
Simple merge

diff --cc xen/include/asm-x86/shadow.h
Simple merge